* Re: FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree [not found] ` <1415725705.3398.98.camel@decadent.org.uk> @ 2014-11-11 22:11 ` Brian Norris 2014-11-11 23:26 ` Greg KH 2014-11-12 6:06 ` Rafał Miłecki 0 siblings, 2 replies; 5+ messages in thread From: Brian Norris @ 2014-11-11 22:11 UTC (permalink / raw) To: Ben Hutchings; +Cc: Greg KH, Rafał Miłecki, linux-mtd, stable + linux-mtd, Rafal On Tue, Nov 11, 2014 at 05:08:25PM +0000, Ben Hutchings wrote: > On Tue, 2014-11-11 at 14:17 +0900, Greg KH wrote: > > On Mon, Nov 10, 2014 at 03:53:49PM -0800, Brian Norris wrote: > > > On Mon, Nov 10, 2014 at 01:34:24PM +0900, Greg Kroah-Hartman wrote: > > > > The patch below does not apply to the 3.17-stable tree. > > > > If someone wants it applied there, or to any other stable or longterm > > > > tree, then please email the backport, including the original git commit > > > > id to <stable@vger.kernel.org>. > > > > > > Did you follow the annotations in the commit message? The Canonical-run > > > 3.16.x stable seemed to pick them up just fine. Or did I get the syntax > > > wrong? (I still owe you an update to > > > Documentation/stable-kernel-rules.txt, by the way.) > > > > > > > ------------------ original commit in Linus's tree ------------------ > > > > > > > > From a5b7616c55e188fe3d6ef686bef402d4703ecb62 Mon Sep 17 00:00:00 2001 > > > ... > > > > Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") > > > > Cc: <stable@vger.kernel.org> # 3.16.x: 32f1b7c8352f: mtd: move support for struct flash_platform_data into m25p80 > > > > Cc: <stable@vger.kernel.org> # 3.16.x: 90e55b3812a1: mtd: m25p80: get rid of spi_get_device_id > > > > Cc: <stable@vger.kernel.org> # 3.16.x: 70f3ce0510af: mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id > > > > Cc: <stable@vger.kernel.org> # 3.16.x > > > > > > I am able to successfully checkout your linux-3.17.y and: > > > > > > git cherry-pick 32f1b7c8352f > > > git cherry-pick 90e55b3812a1 > > > git cherry-pick 70f3ce0510af > > > git cherry-pick a5b7616c55e1 > > > > That all seems to be a ton of churn for a stable kernel patch, > > especially something as "simple" as a module alias, don't you agree? > > That's why I wouldn't apply all of those patches, sorry. Then why did your original email state a different reason? > Unfortunately there isn't a really tiny fix for this. And I think > losing all the module aliases is a pretty serious regression. Definitely a serious regression, but I can understand Greg's reluctance to pull in the other dependencies for -stable. How about the following backport? I compile tested with CONFIG_MTD_M25P80 as 'm' and 'y', and I made sure the module aliases show up in modinfo. From: Ben Hutchings <ben@decadent.org.uk> Date: Tue, 30 Sep 2014 03:14:55 +0100 Subject: [PATCH] mtd: m25p80: Fix module aliases for m25p80 m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but its use was also removed at the same time. Now if m25p80 is built as a module it doesn't get the necessary aliases to be loaded automatically. A clean solution to this will involve defining the list of device IDs in spi-nor.h and removing struct spi_device_id from the spi-nor API, but this is quite a large change. As a quick fix suitable for stable, copy the device IDs back into m25p80. Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") Signed-off-by: Ben Hutchings <ben@decadent.org.uk> [Brian: backport without the dependencies] Signed-off-by: Brian Norris <computersforpeace@gmail.com> --- drivers/mtd/devices/m25p80.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index ed7e0a1bed3c..5935f0a3ac6f 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -245,6 +245,56 @@ static int m25p_remove(struct spi_device *spi) } +/* + * XXX This needs to be kept in sync with spi_nor_ids. We can't share + * it with spi-nor, because if this is built as a module then modpost + * won't be able to read it and add appropriate aliases. + */ +static const struct spi_device_id m25p_ids[] = { + {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"}, + {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"}, + {"at26df321"}, {"at45db081d"}, + {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"}, + {"en25q64"}, {"en25qh128"}, {"en25qh256"}, + {"f25l32pa"}, + {"mr25h256"}, {"mr25h10"}, + {"gd25q32"}, {"gd25q64"}, + {"160s33b"}, {"320s33b"}, {"640s33b"}, + {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"}, + {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"}, + {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"}, + {"mx66l1g55g"}, + {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"}, + {"n25q512a"}, {"n25q512ax3"}, {"n25q00"}, + {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"}, + {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"}, + {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"}, + {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"}, + {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"}, + {"s25fl016k"}, {"s25fl064k"}, + {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"}, + {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"}, + {"sst25wf040"}, + {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"}, + {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"}, + {"m25p128"}, {"n25q032"}, + {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"}, + {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, + {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, + {"m45pe10"}, {"m45pe80"}, {"m45pe16"}, + {"m25pe20"}, {"m25pe80"}, {"m25pe16"}, + {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"}, + {"m25px64"}, + {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"}, + {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"}, + {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"}, + {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"}, + {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"}, + { }, +}; +MODULE_DEVICE_TABLE(spi, m25p_ids); + + static struct spi_driver m25p80_driver = { .driver = { .name = "m25p80", ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree 2014-11-11 22:11 ` FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree Brian Norris @ 2014-11-11 23:26 ` Greg KH 2014-11-12 6:06 ` Rafał Miłecki 1 sibling, 0 replies; 5+ messages in thread From: Greg KH @ 2014-11-11 23:26 UTC (permalink / raw) To: Brian Norris; +Cc: linux-mtd, Rafał Miłecki, Ben Hutchings, stable On Tue, Nov 11, 2014 at 02:11:52PM -0800, Brian Norris wrote: > + linux-mtd, Rafal > > On Tue, Nov 11, 2014 at 05:08:25PM +0000, Ben Hutchings wrote: > > On Tue, 2014-11-11 at 14:17 +0900, Greg KH wrote: > > > On Mon, Nov 10, 2014 at 03:53:49PM -0800, Brian Norris wrote: > > > > On Mon, Nov 10, 2014 at 01:34:24PM +0900, Greg Kroah-Hartman wrote: > > > > > The patch below does not apply to the 3.17-stable tree. > > > > > If someone wants it applied there, or to any other stable or longterm > > > > > tree, then please email the backport, including the original git commit > > > > > id to <stable@vger.kernel.org>. > > > > > > > > Did you follow the annotations in the commit message? The Canonical-run > > > > 3.16.x stable seemed to pick them up just fine. Or did I get the syntax > > > > wrong? (I still owe you an update to > > > > Documentation/stable-kernel-rules.txt, by the way.) > > > > > > > > > ------------------ original commit in Linus's tree ------------------ > > > > > > > > > > From a5b7616c55e188fe3d6ef686bef402d4703ecb62 Mon Sep 17 00:00:00 2001 > > > > ... > > > > > Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") > > > > > Cc: <stable@vger.kernel.org> # 3.16.x: 32f1b7c8352f: mtd: move support for struct flash_platform_data into m25p80 > > > > > Cc: <stable@vger.kernel.org> # 3.16.x: 90e55b3812a1: mtd: m25p80: get rid of spi_get_device_id > > > > > Cc: <stable@vger.kernel.org> # 3.16.x: 70f3ce0510af: mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id > > > > > Cc: <stable@vger.kernel.org> # 3.16.x > > > > > > > > I am able to successfully checkout your linux-3.17.y and: > > > > > > > > git cherry-pick 32f1b7c8352f > > > > git cherry-pick 90e55b3812a1 > > > > git cherry-pick 70f3ce0510af > > > > git cherry-pick a5b7616c55e1 > > > > > > That all seems to be a ton of churn for a stable kernel patch, > > > especially something as "simple" as a module alias, don't you agree? > > > That's why I wouldn't apply all of those patches, sorry. > > Then why did your original email state a different reason? It's a form letter :) The amount of patches I deal with precludes me from providing custom responses to all patches, especially when the real reason here was that the patch, as-is, didn't apply. Sorry for not being more explicit then. > > Unfortunately there isn't a really tiny fix for this. And I think > > losing all the module aliases is a pretty serious regression. > > Definitely a serious regression, but I can understand Greg's reluctance > to pull in the other dependencies for -stable. > > How about the following backport? I compile tested with > CONFIG_MTD_M25P80 as 'm' and 'y', and I made sure the module aliases > show up in modinfo. > > From: Ben Hutchings <ben@decadent.org.uk> > Date: Tue, 30 Sep 2014 03:14:55 +0100 > Subject: [PATCH] mtd: m25p80: Fix module aliases for m25p80 > > m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The > MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but > its use was also removed at the same time. Now if m25p80 is built as > a module it doesn't get the necessary aliases to be loaded > automatically. > > A clean solution to this will involve defining the list of device > IDs in spi-nor.h and removing struct spi_device_id from the spi-nor > API, but this is quite a large change. > > As a quick fix suitable for stable, copy the device IDs back into > m25p80. > > Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> > [Brian: backport without the dependencies] > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > --- > drivers/mtd/devices/m25p80.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) > > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c > index ed7e0a1bed3c..5935f0a3ac6f 100644 > --- a/drivers/mtd/devices/m25p80.c > +++ b/drivers/mtd/devices/m25p80.c > @@ -245,6 +245,56 @@ static int m25p_remove(struct spi_device *spi) > } > > > +/* > + * XXX This needs to be kept in sync with spi_nor_ids. We can't share > + * it with spi-nor, because if this is built as a module then modpost > + * won't be able to read it and add appropriate aliases. > + */ > +static const struct spi_device_id m25p_ids[] = { > + {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"}, > + {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"}, > + {"at26df321"}, {"at45db081d"}, > + {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"}, > + {"en25q64"}, {"en25qh128"}, {"en25qh256"}, > + {"f25l32pa"}, > + {"mr25h256"}, {"mr25h10"}, > + {"gd25q32"}, {"gd25q64"}, > + {"160s33b"}, {"320s33b"}, {"640s33b"}, > + {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"}, > + {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"}, > + {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"}, > + {"mx66l1g55g"}, > + {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"}, > + {"n25q512a"}, {"n25q512ax3"}, {"n25q00"}, > + {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"}, > + {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"}, > + {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"}, > + {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"}, > + {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"}, > + {"s25fl016k"}, {"s25fl064k"}, > + {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"}, > + {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"}, > + {"sst25wf040"}, > + {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"}, > + {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"}, > + {"m25p128"}, {"n25q032"}, > + {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"}, > + {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, > + {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, > + {"m45pe10"}, {"m45pe80"}, {"m45pe16"}, > + {"m25pe20"}, {"m25pe80"}, {"m25pe16"}, > + {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"}, > + {"m25px64"}, > + {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"}, > + {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"}, > + {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"}, > + {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"}, > + {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"}, > + { }, > +}; > +MODULE_DEVICE_TABLE(spi, m25p_ids); > + > + > static struct spi_driver m25p80_driver = { > .driver = { > .name = "m25p80", This looks much more reasonable and sane to me, I'll queue it up soon, thanks for the backport. greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree 2014-11-11 22:11 ` FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree Brian Norris 2014-11-11 23:26 ` Greg KH @ 2014-11-12 6:06 ` Rafał Miłecki 2014-11-12 6:21 ` Greg KH 1 sibling, 1 reply; 5+ messages in thread From: Rafał Miłecki @ 2014-11-12 6:06 UTC (permalink / raw) To: Brian Norris Cc: Greg KH, linux-mtd@lists.infradead.org, Ben Hutchings, Stable On 11 November 2014 23:11, Brian Norris <computersforpeace@gmail.com> wrote: > How about the following backport? I compile tested with > CONFIG_MTD_M25P80 as 'm' and 'y', and I made sure the module aliases > show up in modinfo. > > From: Ben Hutchings <ben@decadent.org.uk> > Date: Tue, 30 Sep 2014 03:14:55 +0100 > Subject: [PATCH] mtd: m25p80: Fix module aliases for m25p80 > > m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The > MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but > its use was also removed at the same time. Now if m25p80 is built as > a module it doesn't get the necessary aliases to be loaded > automatically. > > A clean solution to this will involve defining the list of device > IDs in spi-nor.h and removing struct spi_device_id from the spi-nor > API, but this is quite a large change. > > As a quick fix suitable for stable, copy the device IDs back into > m25p80. > > Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> > [Brian: backport without the dependencies] > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > --- > drivers/mtd/devices/m25p80.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 50 insertions(+) > > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c > index ed7e0a1bed3c..5935f0a3ac6f 100644 > --- a/drivers/mtd/devices/m25p80.c > +++ b/drivers/mtd/devices/m25p80.c > @@ -245,6 +245,56 @@ static int m25p_remove(struct spi_device *spi) > } > > > +/* > + * XXX This needs to be kept in sync with spi_nor_ids. We can't share > + * it with spi-nor, because if this is built as a module then modpost > + * won't be able to read it and add appropriate aliases. > + */ > +static const struct spi_device_id m25p_ids[] = { > + {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"}, > + {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"}, > + {"at26df321"}, {"at45db081d"}, > + {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"}, > + {"en25q64"}, {"en25qh128"}, {"en25qh256"}, > + {"f25l32pa"}, > + {"mr25h256"}, {"mr25h10"}, > + {"gd25q32"}, {"gd25q64"}, > + {"160s33b"}, {"320s33b"}, {"640s33b"}, > + {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"}, > + {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"}, > + {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"}, > + {"mx66l1g55g"}, > + {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"}, > + {"n25q512a"}, {"n25q512ax3"}, {"n25q00"}, > + {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"}, > + {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"}, > + {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"}, > + {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"}, > + {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"}, > + {"s25fl016k"}, {"s25fl064k"}, > + {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"}, > + {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"}, > + {"sst25wf040"}, > + {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"}, > + {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"}, > + {"m25p128"}, {"n25q032"}, > + {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"}, > + {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, > + {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, > + {"m45pe10"}, {"m45pe80"}, {"m45pe16"}, > + {"m25pe20"}, {"m25pe80"}, {"m25pe16"}, > + {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"}, > + {"m25px64"}, > + {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"}, > + {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"}, > + {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"}, > + {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"}, > + {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"}, > + { }, > +}; > +MODULE_DEVICE_TABLE(spi, m25p_ids); One question: is changing MODULE_DEVICE_TABLE enough to trigger proper module auto-load? So far I believed MODULE_DEVICE_TABLE is used for "modinfo" only. I also believed that loading module is triggered by the "id_table". -- Rafał ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree 2014-11-12 6:06 ` Rafał Miłecki @ 2014-11-12 6:21 ` Greg KH 2014-11-12 6:47 ` Rafał Miłecki 0 siblings, 1 reply; 5+ messages in thread From: Greg KH @ 2014-11-12 6:21 UTC (permalink / raw) To: Rafał Miłecki Cc: linux-mtd@lists.infradead.org, Brian Norris, Ben Hutchings, Stable On Wed, Nov 12, 2014 at 07:06:57AM +0100, Rafał Miłecki wrote: > On 11 November 2014 23:11, Brian Norris <computersforpeace@gmail.com> wrote: > > How about the following backport? I compile tested with > > CONFIG_MTD_M25P80 as 'm' and 'y', and I made sure the module aliases > > show up in modinfo. > > > > From: Ben Hutchings <ben@decadent.org.uk> > > Date: Tue, 30 Sep 2014 03:14:55 +0100 > > Subject: [PATCH] mtd: m25p80: Fix module aliases for m25p80 > > > > m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The > > MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but > > its use was also removed at the same time. Now if m25p80 is built as > > a module it doesn't get the necessary aliases to be loaded > > automatically. > > > > A clean solution to this will involve defining the list of device > > IDs in spi-nor.h and removing struct spi_device_id from the spi-nor > > API, but this is quite a large change. > > > > As a quick fix suitable for stable, copy the device IDs back into > > m25p80. > > > > Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") > > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> > > [Brian: backport without the dependencies] > > Signed-off-by: Brian Norris <computersforpeace@gmail.com> > > --- > > drivers/mtd/devices/m25p80.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 50 insertions(+) > > > > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c > > index ed7e0a1bed3c..5935f0a3ac6f 100644 > > --- a/drivers/mtd/devices/m25p80.c > > +++ b/drivers/mtd/devices/m25p80.c > > @@ -245,6 +245,56 @@ static int m25p_remove(struct spi_device *spi) > > } > > > > > > +/* > > + * XXX This needs to be kept in sync with spi_nor_ids. We can't share > > + * it with spi-nor, because if this is built as a module then modpost > > + * won't be able to read it and add appropriate aliases. > > + */ > > +static const struct spi_device_id m25p_ids[] = { > > + {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"}, > > + {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"}, > > + {"at26df321"}, {"at45db081d"}, > > + {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"}, > > + {"en25q64"}, {"en25qh128"}, {"en25qh256"}, > > + {"f25l32pa"}, > > + {"mr25h256"}, {"mr25h10"}, > > + {"gd25q32"}, {"gd25q64"}, > > + {"160s33b"}, {"320s33b"}, {"640s33b"}, > > + {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"}, > > + {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"}, > > + {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"}, > > + {"mx66l1g55g"}, > > + {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"}, > > + {"n25q512a"}, {"n25q512ax3"}, {"n25q00"}, > > + {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"}, > > + {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"}, > > + {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"}, > > + {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"}, > > + {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"}, > > + {"s25fl016k"}, {"s25fl064k"}, > > + {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"}, > > + {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"}, > > + {"sst25wf040"}, > > + {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"}, > > + {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"}, > > + {"m25p128"}, {"n25q032"}, > > + {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"}, > > + {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, > > + {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, > > + {"m45pe10"}, {"m45pe80"}, {"m45pe16"}, > > + {"m25pe20"}, {"m25pe80"}, {"m25pe16"}, > > + {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"}, > > + {"m25px64"}, > > + {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"}, > > + {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"}, > > + {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"}, > > + {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"}, > > + {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"}, > > + { }, > > +}; > > +MODULE_DEVICE_TABLE(spi, m25p_ids); > > One question: is changing MODULE_DEVICE_TABLE enough to trigger proper > module auto-load? Yes. > So far I believed MODULE_DEVICE_TABLE is used for "modinfo" only. I > also believed that loading module is triggered by the "id_table". Nope MODULE_DEVICE_TABLE() does it all. greg k-h ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree 2014-11-12 6:21 ` Greg KH @ 2014-11-12 6:47 ` Rafał Miłecki 0 siblings, 0 replies; 5+ messages in thread From: Rafał Miłecki @ 2014-11-12 6:47 UTC (permalink / raw) To: Greg KH; +Cc: linux-mtd@lists.infradead.org, Brian Norris, Ben Hutchings, Stable On 12 November 2014 07:21, Greg KH <gregkh@linuxfoundation.org> wrote: > On Wed, Nov 12, 2014 at 07:06:57AM +0100, Rafał Miłecki wrote: >> On 11 November 2014 23:11, Brian Norris <computersforpeace@gmail.com> wrote: >> > How about the following backport? I compile tested with >> > CONFIG_MTD_M25P80 as 'm' and 'y', and I made sure the module aliases >> > show up in modinfo. >> > >> > From: Ben Hutchings <ben@decadent.org.uk> >> > Date: Tue, 30 Sep 2014 03:14:55 +0100 >> > Subject: [PATCH] mtd: m25p80: Fix module aliases for m25p80 >> > >> > m25p80's device ID table is now spi_nor_ids, defined in spi-nor. The >> > MODULE_DEVICE_TABLE() macro doesn't work with extern definitions, but >> > its use was also removed at the same time. Now if m25p80 is built as >> > a module it doesn't get the necessary aliases to be loaded >> > automatically. >> > >> > A clean solution to this will involve defining the list of device >> > IDs in spi-nor.h and removing struct spi_device_id from the spi-nor >> > API, but this is quite a large change. >> > >> > As a quick fix suitable for stable, copy the device IDs back into >> > m25p80. >> > >> > Fixes: 03e296f613af ("mtd: m25p80: use the SPI nor framework") >> > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> >> > [Brian: backport without the dependencies] >> > Signed-off-by: Brian Norris <computersforpeace@gmail.com> >> > --- >> > drivers/mtd/devices/m25p80.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ >> > 1 file changed, 50 insertions(+) >> > >> > diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c >> > index ed7e0a1bed3c..5935f0a3ac6f 100644 >> > --- a/drivers/mtd/devices/m25p80.c >> > +++ b/drivers/mtd/devices/m25p80.c >> > @@ -245,6 +245,56 @@ static int m25p_remove(struct spi_device *spi) >> > } >> > >> > >> > +/* >> > + * XXX This needs to be kept in sync with spi_nor_ids. We can't share >> > + * it with spi-nor, because if this is built as a module then modpost >> > + * won't be able to read it and add appropriate aliases. >> > + */ >> > +static const struct spi_device_id m25p_ids[] = { >> > + {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"}, >> > + {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"}, >> > + {"at26df321"}, {"at45db081d"}, >> > + {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"}, >> > + {"en25q64"}, {"en25qh128"}, {"en25qh256"}, >> > + {"f25l32pa"}, >> > + {"mr25h256"}, {"mr25h10"}, >> > + {"gd25q32"}, {"gd25q64"}, >> > + {"160s33b"}, {"320s33b"}, {"640s33b"}, >> > + {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"}, >> > + {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"}, >> > + {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"}, >> > + {"mx66l1g55g"}, >> > + {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"}, >> > + {"n25q512a"}, {"n25q512ax3"}, {"n25q00"}, >> > + {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"}, >> > + {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"}, >> > + {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"}, >> > + {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"}, >> > + {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"}, >> > + {"s25fl016k"}, {"s25fl064k"}, >> > + {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"}, >> > + {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"}, >> > + {"sst25wf040"}, >> > + {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"}, >> > + {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"}, >> > + {"m25p128"}, {"n25q032"}, >> > + {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"}, >> > + {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"}, >> > + {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"}, >> > + {"m45pe10"}, {"m45pe80"}, {"m45pe16"}, >> > + {"m25pe20"}, {"m25pe80"}, {"m25pe16"}, >> > + {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"}, >> > + {"m25px64"}, >> > + {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"}, >> > + {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"}, >> > + {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"}, >> > + {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"}, >> > + {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"}, >> > + { }, >> > +}; >> > +MODULE_DEVICE_TABLE(spi, m25p_ids); >> >> One question: is changing MODULE_DEVICE_TABLE enough to trigger proper >> module auto-load? > > Yes. Thanks. Patch looks OK then. -- Rafał ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-12 6:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <14155940648@kroah.com>
[not found] ` <20141110235349.GA24364@ld-irv-0074>
[not found] ` <20141111051759.GC23920@kroah.com>
[not found] ` <1415725705.3398.98.camel@decadent.org.uk>
2014-11-11 22:11 ` FAILED: patch "[PATCH] mtd: m25p80,spi-nor: Fix module aliases for m25p80" failed to apply to 3.17-stable tree Brian Norris
2014-11-11 23:26 ` Greg KH
2014-11-12 6:06 ` Rafał Miłecki
2014-11-12 6:21 ` Greg KH
2014-11-12 6:47 ` Rafał Miłecki
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox